From cc1b422f6442735f13e0f483277466fc38d6df28 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Mon, 14 Nov 2016 03:47:22 +0100 Subject: [PATCH] snapshot: Convert GtkGrid --- gtk/gtkgrid.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c index 699409f214..f74d67a2c5 100644 --- a/gtk/gtkgrid.c +++ b/gtk/gtkgrid.c @@ -1651,20 +1651,25 @@ gtk_grid_allocate (GtkCssGadget *gadget, gtk_container_get_children_clip (GTK_CONTAINER (grid), out_clip); } -static GskRenderNode * -gtk_grid_get_render_node (GtkWidget *widget, - GskRenderer *renderer) -{ - GskRenderNode *res = gtk_css_gadget_get_render_node (GTK_GRID (widget)->priv->gadget, - renderer, - FALSE); - - if (res == NULL) - return NULL; - - gtk_container_propagate_render_node (GTK_CONTAINER (widget), renderer, res); +static gboolean +gtk_grid_render (GtkCssGadget *gadget, + GtkSnapshot *snapshot, + int x, + int y, + int width, + int height, + gpointer data) +{ + GTK_WIDGET_CLASS (gtk_grid_parent_class)->snapshot (gtk_css_gadget_get_owner (gadget), snapshot); + + return FALSE; +} - return res; +static void +gtk_grid_snapshot (GtkWidget *widget, + GtkSnapshot *snapshot) +{ + gtk_css_gadget_snapshot (GTK_GRID (widget)->priv->gadget, snapshot); } static void @@ -1680,7 +1685,7 @@ gtk_grid_class_init (GtkGridClass *class) widget_class->size_allocate = gtk_grid_size_allocate; widget_class->measure = gtk_grid_measure_; - widget_class->get_render_node = gtk_grid_get_render_node; + widget_class->snapshot = gtk_grid_snapshot; container_class->add = gtk_grid_add; container_class->remove = gtk_grid_remove; @@ -1788,7 +1793,7 @@ gtk_grid_init (GtkGrid *grid) gtk_grid_measure, gtk_grid_allocate, NULL, - NULL, + gtk_grid_render, NULL, NULL); -- 2.30.2